git branch strategy

Git flow

Basic branch strategy
Define specific branches of different purposes and outlines how they should interact
Below five branches are method of git flow

• main: primary branch of project, should stable and released stable
• feature: develop branch of seperate feature
• develop: branch that has codes from feature branch
• release: QA branch before release
• hotfix: if critical bug is found in main branch, fix and merged to main and develop branch

TBD(trunk based development)

Alternative of Git flow
Git flow has serious problems of web application, causes many conflict and rebase.
Often used in open-source